api/eqpt_views.py

@@ -188,9 +188,6 @@ def eqpt_result(request):

                 @logit
              

                 def screen_eqpt_result(request):
              

                     point_id = request.POST.get('point_id', '')
              

                -    kw = request.POST.get('kw', '')
              

                -    page = request.POST.get('page', 1)
              

                -    num = request.POST.get('num', 20)
              

                 
              

                     try:
              

                         point = IsolationPointInfo.objects.get(point_id=point_id, status=True)
              
@@ -216,8 +213,6 @@ def screen_eqpt_result(request):

                     has_upload_temperature_num = len(logs)
              

                     fever_num = len([1 for temperature in logs.values() if temperature > settings.FEVER_TEMPERATURE])
              

                 
              

                -    if kw:
              

                -        eqpts = eqpts.filter(Q(name__icontains=kw) | Q(phone__icontains=kw))
              

                     eqpts = [{**eqpt.screen_data, **{
              

                         'has_upload': eqpt.macid in logs,
              

                         'temperature': logs.get(eqpt.macid, 0),
              
@@ -227,7 +222,6 @@ def screen_eqpt_result(request):

                         'room': eqpt.get('room'),
              

                         'content': eqpt.get('remark'),
              

                     } for eqpt in eqpts if eqpt.get('remark')]
              

                -    eqpts, left = pagination(eqpts, page, num)
              

                 
              

                     # var name: String = ""
              

                     # var room: String = ""
              
@@ -253,7 +247,6 @@ def screen_eqpt_result(request):

                 
              

                     return response(data={
              

                         'eqpts': eqpts,
              

                -        'left': left,
              

                         'reminds': reminds,
              

                         'total_active_eqpt_num': total_active_eqpt_num,
              

                         'has_upload_temperature_num': has_upload_temperature_num,
              

equipment/models.py

@@ -237,7 +237,7 @@ class ThermometerEquipmentInfo(BaseModelMixin):

                     def screen_data(self):
              

                         return {
              

                             'remark': self.remark,
              

                -            'last_submit_at': tc.local_string(utc_dt=self.last_submit_at),
              

                +            'last_submit_at': tc.local_string(utc_dt=self.last_submit_at, format='%m-%d %H:%M'),
              

                         }
              

                 
              

                 
              

requirements.txt

@@ -1,4 +1,5 @@

                 StatusCode==1.0.0
              

                +TimeConvert==1.6.0
              

                 furl==2.1.2
              

                 jsonfield==3.1.0
              

                 mysqlclient==2.0.3